debian/rules: Drop old/useless cmake workaround
authorBoyuan Yang <byang@debian.org>
Sat, 23 May 2020 15:25:48 +0000 (11:25 -0400)
committerBoyuan Yang <byang@debian.org>
Sat, 23 May 2020 19:44:49 +0000 (15:44 -0400)
debian/patches/0003-use-system-libraries.patch
debian/rules

index be856837bf3d4af8ad4a955705d612cf93e8c822..99ba9e42cbadb39c7119aead1e756c2c3c6fc49b 100644 (file)
@@ -7,7 +7,7 @@ Subject: use-system-libraries
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 4883990..f6eccad 100644
+index 4883990..e600408 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -1,7 +1,7 @@
@@ -15,7 +15,7 @@ index 4883990..f6eccad 100644
 -include_directories(../deps/marisa-0.2.5/include)
 -include_directories(../deps/rapidjson-1.1.0)
 -include_directories(../deps/tclap-1.2.2)
-+include_directories(/usr/include/marisa)
++#include_directories(/usr/include/marisa)
 +include_directories(/usr/include/rapidjson)
 +include_directories(/usr/include/tclap)
  
index 50e26c1c2ff1e10f3f9dc94a21934045015a53a9..6dce639f40570b838d74796e6821226a900c86f1 100755 (executable)
@@ -6,10 +6,6 @@
 # see FEATURE AREAS in dpkg-buildflags(1)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-# CMake doesn't use CPPFLAGS, pass them to CFLAGS/CXXFLAGS to enable the
-# missing (hardening) flags.
-CFLAGS += $(CPPFLAGS)
-
 include /usr/share/dpkg/architecture.mk
 
 %: